dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
46c5a2c
)
Merge "Remove another undefined $env and TODO comment for it too"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Wed, 5 Mar 2014 00:06:04 +0000
(
00:06
+0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Wed, 5 Mar 2014 00:06:04 +0000
(
00:06
+0000)
includes/media/Jpeg.php
patch
|
blob
|
history
diff --git
a/includes/media/Jpeg.php
b/includes/media/Jpeg.php
index
ee7eff8
..
9ed626f
100644
(file)
--- a/
includes/media/Jpeg.php
+++ b/
includes/media/Jpeg.php
@@
-80,8
+80,7
@@
class JpegHandler extends ExifBitmapHandler {
wfDebug( __METHOD__ . ": running jpgtran: $cmd\n" );
wfProfileIn( 'jpegtran' );
$retval = 0;
- // @todo FIXME Undefined variable $env
- $err = wfShellExecWithStderr( $cmd, $retval, $env );
+ $err = wfShellExecWithStderr( $cmd, $retval );
wfProfileOut( 'jpegtran' );
if ( $retval !== 0 ) {
$this->logErrorForExternalProcess( $retval, $err, $cmd );